From: GPSBabel <gpsbabel@users.noreply.github.com>
Date: Sat, 9 Mar 2019 23:25:22 +0000 (-0600)
Subject: Merge branch 'master' into skytraq
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~26^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=fc7143e737580eeff65d82f8bf9a17d4f0f77bd1;p=gpsbabel.git

Merge branch 'master' into skytraq
---

fc7143e737580eeff65d82f8bf9a17d4f0f77bd1
diff --cc skytraq.cc
index 913262a31,0f7e75232..a7e869b45
--- a/skytraq.cc
+++ b/skytraq.cc
@@@ -269,11 -289,11 +289,11 @@@ skytraq_calc_checksum(const unsigned ch
  }
  
  static int
- skytraq_rd_msg(const void* payload, unsigned int len)
+ skytraq_rd_msg(void* payload, unsigned int len)
  {
 -  int errors = 5;		/* allow this many errors */
 +  int errors = 5;		// Allow this many receiver errors silently.
    unsigned int c, i, state;
 -  int rcv_len;
 +  signed int rcv_len;		// Negative length is read error.
  
    for (i = 0, state = 0; i < RETRIES && state < sizeof(MSG_START); i++) {
      c = rd_char(&errors);